turbojpeg: Fix JPEG decoding from TIFFs with versions >=2.1.4 #286
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
turbojpeg introduced support for `abbreviated datastreams` in 2.1.4, returning early from `tjDecompressHeader3` if such a datastream is detected, and thus not updating the values for width, height colorspace and subsampling that we relied on. This didn't cause issues with the standard ImageIO `TIFFImageReader` from the `com.sun` package, since it always completely decoded the JPEG. However, the TwelveMonkeys implementation was more efficient and only used the abbreviated datastream from the TIFF Header, as intended. This broke our code, since we assumed that width, height, colorspace and subsampling were always available. Luckily the fix was rather trivial: Simply check if the values were set tor not and return `null` if they weren't. The `null` info value doesn't cause any issues, since by the time the values are needed, we already have a new input with the full datastream available and will read the info from there.
stefan-it
previously approved these changes
May 7, 2024
jbaiter
force-pushed
the
fix-twelvemonkeys-tiffjpeg
branch
from
27286f3 to
2395d93
Compare
stefan-it
approved these changes
May 7, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
turbojpeg introduced support for
abbreviated datastreamsin 2.1.4, returning early fromtjDecompressHeader3if such a datastream is detected, and thus not updating the values for width, height colorspace and subsampling that we relied on.This didn't cause issues with the standard ImageIO
TIFFImageReaderfrom thecom.sunpackage, since it always completely decoded the JPEG. However, the TwelveMonkeys implementation was more efficient and only used the abbreviated datastream from the TIFF Header, as intended.This broke our code, since we assumed that width, height, colorspace and subsampling were always available.
Luckily the fix was rather trivial: Simply check if the values were set tor not and return
nullif they weren't. Thenullinfo value doesn't cause any issues, since by the time the values are needed, we already have a new input with the full datastream available and will read the info from there.